Tighten up the code a bit