Tighten up excess whitespace