Refactor AK Sync

Refactor and improve code quality for AK sync.
Oh, makes sense. Thought we're overriding the defaults with real data...