Refactoring: eradicated use of 'this' keyword