Added Collectible, cleaned some imports and renamed some variables