More code improvements (minor).