code cleanup
XAPI statement helper class