Started getting message IDs. Also made rubocop happy (mostly)