code clean up and comment