improved a little bit on CLI parsing