Changed lighting, code cleanup