code clean up and comments