initial code clean up