Fix some indentation and trailing whitespace