Minor cleanup + check for public/private key existence