Cleanup and fix indentation