Some style fixes in model