Fixed use of G. instead of self.
Minor cosmetic fixes