Graphics refactoring.