I did a cleanup for ya, not everything i want to cleanup, but that'll be done when i'm ready to merge it into Master (i'd like to go through and document everything before i merge)
https://github.com/ldtteam/ChatChain/commit/d33bf98e75923062e3f76a4fa8e0002f8c095e11