Use Consistent Coding Conventions

[cwarden]

Make formatting consistent:

• Use tabs for indentation rather than mixed tabs and spaces
• Make use of whitespace and braces in if/else statements consistent