tweak log statement
tweak log statement and helper