I cannot refrain myself from sending some more suggestions, aiming
mainly at style consistency.