Tighten up the code a little.