Improve README
Code refactoring