bucketized output + moved inspect_storage logic to its own file