more constants clean up