Comment clean up