If you want to refactor something - it should be in another PR