Added more comments, as per evaluation criteria