Refactoring

Tidbit naming, database population which required removing private
setters