some namespace simplification