Cosmetics in docs and code
Implement core and cli modules