Update README
Code refactoring