re-organized constants