finish keyword refactor