Replaced 2 instances of 'this.' with CS @ operator