Reformat before working on it.
Start reordering class; move logging stuff to top of class.
Reorder methods.