Fixing indexable, refactoring size measurement