Some clean-up of Christian's code
Some more clean-up