Update code style in library

Make it easier to read some lines.
Try to keep lines short.