Minor changes to clean up