Correct exercise numbers to align with lessons
Fix code style
Remove old commented code
Use static casts