Consistent whitespace ++