Cleanup and realign