Minor lay-out settings, breaking comment lines as they acceeded the adviced 80 character-lenght