Cleanup of namespace imports and more code comments