Deleting a comment and also restructure some lines