commandline: resolve several warnings and whitespace cleanups