More Refactoring
Update README