More code improvements.