Simplified & corrected comment preservation