Clean up of commenting