A bit of work on the code style