namespace directive and tidy up linting errors