readded whitespace cleanup