Refactor. Move.