Fix some whitepace issues