Removed dead code
Fixed namespace
Fixed NL