Work on code clean-up.