Minor cleanup for the clean up