Lab 06_home, Stage I & Stage II - refactoring.