Minor tweaking for (probably useless) optimization and appearance.