Made members private, added getters/setters