more code cleanup and file header updates