started refactoring of helmholtz