done code clean up