Cleaned up/consolidated bullet related metadata