CLI code cleanup

This patch removes braces where not needed, and simplifies namespace usage so that these are consistent across the file

Remove braces where not needed, and simplify namespace usage so that …

…these are consistent across the file