Fixed lighting issues
Clean up some code