1. delete obsolete settings

2. format comments

3. move package.el settings to pkg-init.el