Edited the light positioning a bit and cleaned some code