clean up code by using _
clean up code by using _