code formating and namespace fixe