FIX cleanup comments