Cleaned up some code

I cleaned up a few bits here and there and moved the bunny updates to the Bunny class.