Updated readme and did small refactoring changes