small refactor, FROGGS++