Minor changes to clean up the code base