Minor edits on stateT utility functions