Refactored models, mostly syntax and indentation.