tighten up code