Small clean-up of the code. Some comments translated from French to English