Little code refactoring
Updating README