small refactoring +

fixing prod troubles