Refactoring running - still not finished :(