Again tighten up / remove unnecessary spacing