code clean up
minor changes