Simplify argument parsing and add usage info