Removed unwanted namespaces

Just minor refactoring , nothing changed in the originial code.