Source code clean-up.