Cleaned up the modeles