Minor update: code clean up