Updated readme and minor refactoring