Cleaned up some stuff in cli.