Change self.annotations by self._annotations to show it's private now. Other small cosmetic changes.