Updated readme
Code style refactoring