code clean up step two