Punctuations improvement