many small changes
change coding style