Mass refactor