Refactory shorttags