Decoupling definitions

Addressing issues I raised in #32 discussion.