Fixed remaining whitespace problems