Improve command line usage, remove data_dir and configuration file