Clean up of commenting around 4