A little clean-up and transparency added