add wrap file
code clean up