Refactor a little, make functional again
Refactor a little, make functional again

SivagnanamCiena/marathon,ss75710541/marathon,janisz/marathon,natemurthy/marathon,mikejihbe/marathon,manojlds/marathon,lelezi/marathon,pugna0/marathon,IanSaunders/marathon,HardikDR/marathon,hangyan/marathon,MrMarvin/marathon,cgvarela/marathon,lelezi/marathon,sledigabel/marathon,vivekjuneja/marathon,ss75710541/marathon,yp-engineering/marathon,EasonYi/marathon,cherrydocker/marathon-1,okuryu/marathon,rtward/marathon,matsluni/marathon,ayouwei/marathon,natemurthy/marathon,rtward/marathon,Kosta-Github/marathon,cgvarela/marathon,guenter/marathon,timcharper/marathon,bsideup/marathon,pgkelley4/marathon,mesosphere/marathon,titosand/marathon,Caerostris/marathon,sepiroth887/marathon,IanSaunders/marathon,ramitsurana/marathon,timcharper/marathon,guenter/marathon,MrMarvin/marathon,pugna0/marathon,hangyan/marathon,janisz/marathon,okuryu/marathon,Caerostris/marathon,titosand/marathon,okuryu/marathon,ramitsurana/marathon,sledigabel/marathon,cherrydocker/marathon-1,janisz/marathon,rtward/marathon,sepiroth887/marathon,Yhgenomics/marathon,guenter/marathon,vivekjuneja/marathon,SivagnanamCiena/marathon,mesosphere/marathon,gsantovena/marathon,janisz/marathon,Caerostris/marathon,ayouwei/marathon,guenter/marathon,bsideup/marathon,HardikDR/marathon,matsluni/marathon,mikejihbe/marathon,Caerostris/marathon,Yhgenomics/marathon,mikejihbe/marathon,murat-lacework/marathon,quamilek/marathon,mesosphere/marathon,meln1k/marathon,gsantovena/marathon,gsantovena/marathon,EasonYi/marathon,lelezi/marathon,ss75710541/marathon,bsideup/marathon,gsantovena/marathon,HardikDR/marathon,ramitsurana/marathon,murat-lacework/marathon,manojlds/marathon,matsluni/marathon,cherrydocker/marathon-1,cgvarela/marathon,mesosphere/marathon,IanSaunders/marathon,ayouwei/marathon,Caerostris/marathon,sledigabel/marathon,quamilek/marathon,pugna0/marathon,guenter/marathon,meln1k/marathon,timcharper/marathon,meln1k/marathon,mesosphere/marathon,sepiroth887/marathon,Yhgenomics/marathon,janisz/marathon,gsantovena/marathon,murat-lacework/marathon,Kosta-Github/marathon,hangyan/marathon,meln1k/marathon,pgkelley4/marathon,meln1k/marathon,yp-engineering/marathon,MrMarvin/marathon,natemurthy/marathon,SivagnanamCiena/marathon,manojlds/marathon,quamilek/marathon,EasonYi/marathon,vivekjuneja/marathon