cleaned up constants