tighten up that code