Minor refactoring
Updated Readme
Updated readme