Latest attempt at whitespace fix