Cleanup whitespacing