Remove namespace
Refactored code