Made argument parsing better