Light code improvements.