Corrected format based on PR feedback