Code cleanup
Code cleanup
Preparing before refreshing in-place