removed unnecessary uses of the self keyword