More readable and consistent spacing