Fixed double goomba bug and beautified