Refactor: language