Addign more refactoring, to meet code standards, it is still pending refactoring for panel tree view class