Fix lesson 42 & refactor code :)