Made small code touch-ups.