Cleaning comments up