[todoxlf] tidy up