Added data storage + updated SQL, PEP-8