refactor elec painter 60%