inner class members set to be called with 'this' operator
code formatting improvements.