Null check and removed redundant "this." references.