Finished Exercise for I.1 and did some cleaning