Schlage Door Codes - Improve how these are added to message templates via field codes

I recently dropped RemoteLock for the direct Schlage integration. It all works seamlessly and as expected... except for this one thing. When inserting the door code in message templates (using any of the field codes OR has available for this), it now includes the internal name of the property door/lock AND doubles it up when there is more than one lock at a rental. For example: 

This is clunky and adds unnecessary confusion for guests.

As a comparison, this is how the exact same message appeared with the RemoteLock integration (same property, different guest) -- which not only looks better but is a much simpler and clear read for the guests:

My request is two-fold:

1. Remove the internal property/door lock name when displaying the code number for guests -- or at least make it optional in case some hosts do prefer it this way. 

2. When there are multiple doors at a property that all share the same code, only display it once. (Again, this could easily be optional in case anyone does prefer it the way you display it now.)

I would look at your settings. I have Schlage and it sends the door code, but doesn't include the lock name.  Mine looks just like your second message.

It handles single-lock properties just fine — it’s only when there are multiple locks at a property (front/back doors) where it gets clunky. I’m assuming yours that you’re referring to is a property with only one lock?