Tidy up ball model