make CommandLine method calls chainable

+ minor cosmetic refactoring