Clean-Up in comments