cleaning up improper use of keyword this