Tighten code a tad.