FIX: Addressing comments (mostly xrange)