Minor change to utilize move semantics