Edited __init__ - File (cleanup needed, resctrut. needed)