Cache this.data into variable
Code fixes according to @tadatuta notations