Added filter to remove whitespace