Moved methods into alphabetal order in models