refactoring: move measures