Arrange a bit the code, missing summary added.