Make string trimming optional