Updated readme
Code refactor