Enigma code tidied up