Minor clean up and comment added