fix: Re-apply reverted formatting improvement commits

fix: Re-apply reverted formatting improvement commits #53