Whitespace/indentation fixes