Update to code clean-up 1