Checkstyle Fixes

Fixed all checkstyle in the model except for hiding fields