refactor: makeup