clean up the code

clean up the code