added clean_up_whitespace