FIxing whitespaces