accessor fix 1

Fixing the extensive use of accessors to access class variables.