Merge Clean & Formatting
Merge Clean Crypto2crypto
Merges & Refactors
Cleaning + PEP8 Formatting