refinements to module design