sto639 markups and refactoring for UTs