cleanup - keep it thin and straight