squash commits, remove uneeded method call, add spaces, small bits of cleanup
Merge pull request #56 from m8ttyB/cleanup

remove unnecessary variables, add spaces, small bits of cleanup