Small refactoring, graphics currently not displaying