Made properties private and added getters