Done refactoring for now, and I updated the README