Update indentation and cleanup file