#86 moved constants to the files where they are used