Tighten up (easier to read)