ready to refactor?