Misc refactoring, paired with tOkeshu