Refactor codes
Merge branch 'master' of git@github.com:BinbinTang/EagleEye.git