[Lab2] slight cleanup