White space/indentation fixes