Minor code style / performance optimizations.
Minor code style / performance optimizations