Refactor eb/summary

This is implements for #23.