Finally fixed whitespace problems