More warning and format cleanup.   Mostly replace "unchecked" with "rawtypes" on suppress fields, got rid of weird spacing