VP-178 Removing whitespaces