Updated Comments and Code