Rename incCapacity to ensureCapacity & minor code cleanup