minor variable renaming + use  existing constant instead of new string