Shorter functions for readability
Merge pull request #4 from sirugh/refactor

Shorter functions for readability