removing comments
changed model names to correct case