Correct whitepace issues