lights: tidy up