Optimise a little
Issue #58 - undefined vars for CP images and when not rendered as table