Cleaned up graphics classes