ciphers PEP-8 optimisation and 27 fixes