rework whitespaces section