Finalizing cleanup week 2