code clean up step one