UI updates / Commenting / Cleaning