Refactoring
Update README