Polishing a bit the code style