holy moly organzing batman
further refactoring & cleaning
jslinting :)