Move constants to a simple definitions