Add comments and remove junk.