Improve command prompt