Eliminate some level 4 warnings and add some white space and some suffixes.