Graphics Module Clean Up Second Pass

Still needs more work, but it is better and more consistent.