Changed from Short to Long tags

also changed format of control blocks to match C5 formatting guidelines