Format Fix

Formatted and fixed up code for all lights except for sink lights, they
contain original code that I'd like to look at later