some coding clean up.