Convert indentation to 2 spaces
Remove trailing whitespace
Fix incorrect indentation