Refactoring :-)