#78 refactoring Run: finished