Whitespace and indentation fixes