Some work on the code style