Remove use of $_