Added align attribute and cleaning.