Pep 8 + repr
Bug corrections in the internal namings