Quick code format in preparation for repackage.