Tightening pass on Core