code clean up 1.5