Make the Bug a constructor, #118