namespace cleanup
#1546 + small fix
closed #1546