Cleanup

bunches of adjustments