Cleaned up order of models