Fix some indentation and unusable whitespace