Make config cat in JSON
Revise coding style