refactor minor