Cleanup datapack
Fix warnings