remove else in favor of just return
fix some docblocks and another return
Merge pull request #64 from cordoval/remove-else-because-of-return

remove else in favor of just return