Further exploration of refactored graphics code
Minor cleanup before the major cleanup