Code change - remove some "this" to make the code clear