shorter sentences

merging previous patches into one