整理and測試

Signed-off-by: e007926 <e007926@gmail.com>