Enhance alignment

Related to #78