Re-factored code for consistency, prototype towards module goal
Merge pull request #2 from vbuck/master

Re-factored code for consistency, prototype towards module goal