Optimization and a code style fix.