more size_t refactored