updated code, fixed lints#3

sgehrman wants to merge 11 commits into

reqable:mainreqable/re-highlight:mainfrom

sgehrman:mainsgehrman/re-highlight:mainCopy head branch name to clipboard