whitespace cleanup
unbreak rekeying