Updated README and refactored some methods