Added line numbers and proper highlighting