Refactor a util module
Merge pull request #14 from michaeljoseph/refactor-modules

Refactor a util module