Comment Clean up