Little refactoring
Little fixes in Readme