Code clean up

Cleaning up of code for week7