Minor formatting tuning, using constant for 13 occurances of same string