Refactored redundant logic into utility methods, deleted some dead code
Used export default instead of named export for utils
Merge pull request #90 from crismali/minor-refactoring-and-drying-up

Refactored redundant logic into utility methods, deleted some dead code