Enhance documentation and remove namespace