Added trimming and str functions