Renamed models
changed protected to private
Did code cleaning and reorganizing