Merge "Fix indentation and whitespace"