Code refactoring
Code refactoring
Updated readme