FIX: Addressing comments