Refactor - rename 1 class and move common method as static there