As per #171, reduce spacing around