Downgrade the access modifier for a few instance fields
and add a few get and set methods. Overall just refactoring