Minor design changes. See #58