changing ENVIRONMENT_PROPERTY order
fixing indentation