Reformat ClickerBundle

Reformatted the ClickerBundle using the Database object