Tighten up a few lines