Very good refactoring =)