Some white space cleaning