Remove unneccessary __init__ definition
Name arguments in call to __init__ for readability purposes
Fix bug introduced by merge