Refactoring by comments about homework 4