Minor code touch ups.