Reindent some chunks of code
Merge pull request #699 from patriciomacadden/reindentation

Reindent some chunks of code