Refactored everything to fit PEP 8 standard