Lighting tweaks/cleanup