Comments + using clean-up