Code cleanup in core class.