Maint/master/change constants to class vars