Clean up more indentation