Moved constants into their corresponding class methods