Minor changes and clean up.