Adding comments and moving statements to facilitate demo