major code commenting structure change