clearing up
few changes