Cleaning a bit the code for consistency