ch03-06 commit
refactoring
refactoring