Issue #123: a bit o restructuring