Update README (highlight code), micro refactoring