Cleanup some whitespace
Fix indentation