Added keypairs
Refactored and cleaned up output