Rewrite spacing logic to properly handle comments