Minor changes in cleaning code up.