Remove minor duplication in transmit body
Use concise block syntax for one liner
Use more descriptive name for beacon collection
Remove unused methods