Small cleanup, started using more Vanilla NBT Constants