Some cosmetic changes to the model