(GL) Cleanups/refactoring