Adding comments and removing namespaces from header