Refactor
Reorganize lib dependency
Added missing include
Updated style
Readded dependency
Merge pull request #3 from v-lopez/new-helper-functions

Refactor some code into helper functions