formatting string improvements
DRY improvements