cleaned up comingling of graphics and data