changing some of the code style