Did some trivial cleanup.