Homework cleanup