Retab CoreToStg, and remove trailing whitespace