Updates to SOTN formatting