Added 'this' keyword where possible

+ Improved readability