Format changes, fix bad indentation and code formatting