General code clean-up.