Refactor eb/summary #23