refactoring
Merge pull request #1 from mimicloud/new

refactoring