Added comments, moved Cryptor to Client