Complete level 4, refactor more code.