Server file completed. CLI_Driver now shared.
Code cleanup of large if/else blocks

Large hard-to-read if/else blocks. Changed them to just be
if/else/return blocks for readability.