code clean up and suppress some notices