some cleanup with indendation and stuff
Merge pull request #2 from benwaffle/master

some cleanup with indendation and stuff