Minor cleanup on formatting, whitespace