Refactoring Measure class