Slightly OCD renaming of divs, IDs, etc. Also exercises up to 6.1.