Moved some constants around