cleaning up unnecessary spaces and remaining source info