Some refactoring
Updated README