Tidying code
Finish chapter 8
Merge branch 'master' into sign-in-out