Allow running without jline
Minor cleanup