Remove unused namespace
Refactor methods