cleanup AND addition logic when WhiteSpace