Once more reverted whitespace changes