Clean up some alignment