fix __() funcion and code style