Cleaning up the constructors/accessors -- removed unnecessary methods