Make minor storage survey validation refactoring