refactoring: the end is ny :-)