Took out Base64 stuff. Also format fixes.