Refactor keywords