Update README.md
More refactoring and JSHint fixes.