tirex: refactors

Signed-off-by: Hiroshi Miura <miurahr@linux.com>