refactoring for my personal sanity
fix indentation
Merge pull request #1 from taylorlapeyre/master

Some refactoring