Tighten up the code.