more code clean up