Refactoring
Updated README