Minor Refactor; Updates the README