Code cleanup for week 1.