more prototypal
Merge pull request #34 from andrija-hers/modulecleanup

Looking good, +1'ed from @fyockm as well - merging.