Some more cosmetic changes to the model