Crypt class done & reformat code