Refactoring code
Adding some info to README