Fixed confusing message, and code cleanup

Moved preprocessor defines to left edge, and removed excess
spaces. Message mentioned "Developer key" - with advent of the
key with "Developer Mode" this was confusing. Converted to
"Developer-owned key".
Some fixes - changed name.