Improvements and clean up.