Command line handling now clean