Cleanup
Add braces to if statement
Merge pull request #49 from elihart/cleanup

Cleanup