Better scoping

Remove "this" keyword