code clean up done