Short tag conversion

Replaced regular tags with short tags :<