Rewriting homework.cls a bit