Touch up whitespace and other small issues from inspection