Added requested changes in chapter 5 and removed //TODO