Cosmetic changes
Completed section 2.1.1