Tighten up code a bit.