code clean up started