Clear code styling for the Model Base Object and the tests