Endless refactoring :-)