Improve clean method for swapping data in and out