Moved the placement of some constants that gets frequently change