Improve consistency with function and parameter settins