Cleanup and object inheritance diagram