Closes #664
Reformat code. Refine dependencies. See #650 Original pull request: #663
Closes #650. Original pull request: #663