Adding another return to clean up the js