VID-1993 Updates in response to CR comments

* Formatting
* Removing 'this'
* Using scrollAndClick()