some more method refactoring and a lot more demo shortcuts