General core class coding style cleanup