Cleaned Up Table View