Code Cleanup for Lab Work 2