Remove namespace
Refactor
Refactor