Removed unneeded repeat calling of PROPERTIES.keys()