Updated constructor and modified access level of some data fields to be less accessible