Refactor (continued).