slight refactor, simplify bunny classes, round x,y