Some README changes
Refactored some code and added some new docstrings