Adding line numbers and improved formatting