final fixes to code structure for style cop zero error run