Some code cleanup.

Other than that LGTM.