constants clean up