Cleaning up stray tags.
Moving usings inside namespace.