correcting cli flag
cleaning up conditional