Getting rid of a couple short tags