more code clean up

more code clean up