[Changed] Code comments and minor code improvements