more whitespace formatting fixes