Remove useless space and align the tag