Revert "Fixing mistakes"

This reverts commit fc91c2b842339a5ad6562c5ecf365da768cf4ac2.
Chapter 5 - Still issues