Small improvement on space usage (minor chagne)