Nice refactoring :-)