That looks good to me! The functions cut down on repeating the package/module parts of the names. Single line looks good for just Tok, usually multiline only if specifying Fields too.