Tighten up code