Proper guard clauses.
Formatting.
Merge pull request #3 from jasonmccreary/refactoring

Refactoring