Some change and cleanup