adds refactorings to feed genrator