Mix: Minor refactor according to PEP 328 :)