Ruby style on methods please

Introduced in #4220. This ain't no JavaScript!

Also moved a couple comments to outside the method definitions.

## Verification

 - [ ] Ensure renamed methods are called by the new names.