code clean up
clean code