cleaning - refactoring and preparing for start of tutorial