This mainly keeps std imports tidy, and fixes a couple of newlines.