Refactoring

esxi refactoring