Minor update and added comments