switched all fields to getters & setters