Victor badila general refactoring