Tighten up and simplify