PEP-8 styling
Extra unpacking bug fixed