cleaning up constants