Tighten up formatting