fix(cortex-cli): implement improvements from code analysis (#174)

fix(cortex-cli): implement improvements from code analysis (#174) #349