Nice refactoring!