Whitespace cleanup

Replaced mixed indentation with tabs, for consistency
Removed trailing whitespace