refactoring codez