Commented out code to be removed
Added 'this' keyword