Minor cleanup of storage manager