Minor code cleaning and additional code comments.