Moved constants to a separate class