Code cleanup for @stof