Minor changes and get rid of Align