Fixing/refactoring things not related to CLI.. -200 git points