Add whitespace removal. Change tab handling