Cleanup of hw2bonus.c