use-package :init -> :config and minor refactor