another code clean up