Small improvements

Try to avoid ; { and } in strings and put the ; and { in the same line