Minor refactoring
Updated the README