Cleaning up minor changes