Changed output formatting a little and renamed a list