Improved comments
Removed SMP client calls, as they are only relevant for sending, and not
for retrieving