refactoring for hw tutorial
merging