Making handler function with two parameters
Cleaning up