Converted to PEP8
Removed genekeys
Started new unittests