Somew whitespace fixes