Fix indentation and some other formatting
Fix indentation and formatting