Moved some constants so they are easier to find