More Cleanup/Upgrades

In the new run, I installed an outlet for the main light, which I may just hang right off of the pipe. Plus the flex on the other end facilitates a "saddle bend" to clear some water supply lines.