split out and rename receiver interface and cleanup formatting