Small refactor of Ether ready for private freq addon