Fix typos
Re-number some TODOs
Remove resetButtonClicked