Refactor for not repeat keywords