change and cleanup