Indentation clean up