[TASK] Moved namespaces to class constants
[TASK] Removed some debug code