clean up cartoon and glviewer
Code cleanup