Checkstyle and model test fixes

Almost all of the checkstyle is done for the model.  I may add another
few exceptions for certain warnings because they are not legitimate