Cleaning up. Renaming constants in upper case.