removed unnessesary lines, correct table def