Cleanup

Added random key generation