Fixes to HW2 formatting