GCode refactored