[FNA] #147 first pass cleanup for remainder of Graphics/ - this commit will be for more "structural" changes. more white space and tabbing fixes will be in separate commit