Improve alignment