Added two lines to remove space before a string