More consistent whitespace