Code cleanup for Warder::CLI