Issue #44: Properly style Command Line