refactored little bit. removed unnecessary models.