remove namespace and improve style