fix unnecessary printing fallback, small refactor