Improve question formating