Just clean code and improve logger message

Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>