Add missing comments and minor formatting update