Refactored most current constants into their own object