Refactor level 8.
Merge branch 'lvl-8-refactor'