code clean up bit