refactoring item/bonus structure