cleaned up John the Ripper code