Clean up alignment