Removed extraneous this references
Fixing compiler warnings