FIX: Proper cleanLine handling