Code cleanup

Different versions of graphic use the same base code now.