good refactor!