move constants into class using them