I have been looking at the 2257 compliant links on many sites and from everything I see, it looks like there are three (3) main trends for publishing this information.

John Doe
123 Any Street
Suite 12345
Any Town, USA 55555
(555)555-5555

ABC Company
123 Any Street
Suite 12345
Any Town, USA 55555
(555)555-5555

John Doe
ABC Company
123 Any Street
Suite 12345
Any Town, USA 55555
(555)555-5555

What is the correct way to list this information?

If you have an incorporated or LLC Company and have an office space where your records are housed, do you list the company as the custodian? Or do you still need to list a person as the contact/custodian?