possible indent revert(dev branch) (#550)

I want to include whatever improvements made in the refactor attempt though

Author: bounceme