Cleaner code, better argument parsing.