Refactor

- Removes explicit `return` statements
- Cleans up syntax
Merge pull request #30 from drichert/enhancement/syntax-cleanup

Refactor