Removing unnecessary string trimming