Feature/ethutil refactor