framework refactor
Merge pull request #64 from fengjingchao/fix

framework clean up