Refactor for Enilec