code cleanup, removed namespace which from all over the place