fixed issue with target and overuse of 'this'