Cleaning up data load and also re rendring only when necessary