final code style changes

Just a few minor ones remain but most of them are related to keychain/Id.java which is a bit deprecated and has to be updated/rewritten anyway so that's another story. :)