more code clean up.