Move methods into private space
Pull some code out into smaller methods
Stub future classes
Replace clause with early exit
Reindent base
More steps towards the refactor