Updated line numbers and 80 char limit