Fix some issues with whitespace & indentation