tighten a bit of code