Refactored a lot of the return statements to reduce clutter
Merge pull request #34 from andyhmltn/master

Refactored a lot of the return statements to reduce clutter