Removed commented section. It is no longer needed
Rearranged some stuff so that encryption can work more fluidly.