linted and cleaned. @yannis can you look at this and merge in the morning? I think that adam and nick (and i maybe) talk around your 11am if i'm right. this should take care of issues #77 and #79