cleaned up after initial refactor
fixed missing namespace