clean up, facilitate CLI usage