Unnecessary comments and 'To Dos' removed.