Refactor minor