New comments and removing of un-nessesary code.