Shorten line length and add some extra whitespace and comments