Got rid of encryption, more readability fixes...