replaced the use of instance variables in the private inner classes with
getters
test