code clean up..