rjizkonta, refactor-out