Issue #93: Constructor simplifying and clarifying