Simplify settings definitions and namespace settings