Streamline a bit more
Tighten up key generation / remove redunancy from message keys