cleaning up changes to scatter