Minor cleanup, allow CLI usage