Remove unnecessary usage of instance variable

This is to remove unnecessary usage of instance variable
to keep code clean.

Change-Id: Ia6aec6ddbe46ae23e9406ed1a938acd477d129a2
3 files changed