Cleanup and indentation