Correct whitespaces formatting