Commenting and clean-up in main activity