Work on light and defactoring.