refactoring : moved constants into class