Made the argument parsing a bit more logical