Fix spacing issue and tag inconsistency