A bit more clarity to top-level code

Fixes #238