clean ups and realignments