Improve argument handling of init command