more defaults / namespace cleanup