tighten up the code a bit