fix regex & trim